* dired-x.el (dired-mark-unmarked-files): Fix interactive spec (Bug#8768).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba3c46a3b461502c9caa0a001dd8e8be92d7ccf9..f62098f9295e658e50bf2c3c14d136a0a234c76f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-06-18  Chong Yidong  <cyd@stupidchicken.com>
 
+       * dired-x.el (dired-mark-unmarked-files): Fix interactive spec
+       (Bug#8768).
+
+       * replace.el (occur-mode-map): Set occur-edit-mode binding to "e".
+
        * textmodes/fill.el (default-justification): Add :safe (Bug#8879).
 
        * cus-face.el (custom-declare-face): Call custom-theme-recalc face

diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 548728cf28d2cce770b47bc9915f8449e80a6a7b..ca89d07ea7ff55745be51d9f3185736451bceea1 100644 (file)
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -546,11 +546,14 @@ This functions works by temporarily binding `dired-marker-char' to
 ;; Returns t if any work was done, nil otherwise.
 (defun dired-mark-unmarked-files (regexp msg &optional unflag-p localp)
   "Mark unmarked files matching REGEXP, displaying MSG.
-REGEXP is matched against the entire file name.
-Does not re-mark files which already have a mark.
+REGEXP is matched against the entire file name.  When called
+interactively, prompt for REGEXP.
 With prefix argument, unflag all those files.
 Optional fourth argument LOCALP is as in `dired-get-filename'."
-  (interactive "P")
+  (interactive
+   (list (dired-read-regexp
+         "Mark unmarked files matching regexp (default all): ")
+        nil current-prefix-arg nil))
   (let ((dired-marker-char (if unflag-p ?\s dired-marker-char)))
     (dired-mark-if
      (and